Etymology

... is the study of words and their origins – as opposed to lexicology, which is the study of words and their meanings.

The vetters did point this out.

But ... you would, in any case, probably allow "words" as sufficient answer to either question.